production email config fix and user acount layout fix
2 changed files with 3 additions and 3 deletions
+ 2
- 2
app/views/devise/registrations/edit.html.erb
@@ -46,9 +46,9 @@ |
||
| 46 | 46 |
<div class="clearfix"></div> |
| 47 | 47 |
</div> |
| 48 | 48 |
<div class="form-actions" style="margin: 0px; margin-top: 15px;"> |
| 49 |
- <%= f.submit t 'registration.update' %> |
|
| 49 |
+ <%= f.submit (t 'registration.update') %> |
|
| 50 | 50 |
<%= link_to (t 'nav.back'), :back, class: 'btn btn-link' %> |
| 51 |
- <%= link_to ('<i class="fa fa-exclamation-triangle"></i> '+(t 'registration.cancel_account')).html_safe, registration_path(resource_name), data: { confirm: (t 'registration.cancel_confirmation') }, method: :delete, class: 'btn btn-danger pull-right' %>
|
|
| 51 |
+ <%= link_to ('<i class="fa fa-exclamation-triangle"></i> '+ (t 'registration.cancel_account')).html_safe, registration_path(resource_name), data: { confirm: (t 'registration.cancel_confirmation') }, method: :delete, class: 'btn btn-danger pull-right' %>
|
|
| 52 | 52 |
</div> |
| 53 | 53 |
</div> |
| 54 | 54 |
</div> |
+ 1
- 1
config/environments/production.rb
@@ -93,7 +93,7 @@ RailsWebsiteTemplate::Application.configure do |
||
| 93 | 93 |
:enable_starttls_auto => true, # detects and uses STARTTLS |
| 94 | 94 |
:user_name => ENV["MANDRILL_USERNAME"], |
| 95 | 95 |
:password => ENV["MANDRILL_KEY"], # SMTP password is any valid API key |
| 96 |
- :authentication => 'login', # Mandrill supports 'plain' or 'login' |
|
| 96 |
+ :authentication => 'plain', # Mandrill supports 'plain' or 'login' |
|
| 97 | 97 |
:domain => ENV["DOMAIN_NAME"] # your domain to identify your server when connecting |
| 98 | 98 |
} |
| 99 | 99 |
|